Glad you got it solved, I was going to tell you to check your injection timing, if that is off the engine can make all types of wierd knocks and snaps.