Yes to both--I actually accidentally came close to overlubing her motor, didn't realize it didn't need to be done that often. >< And I made absolutely certain the needle was in the right way. The only thing I can think of that was causing the knocking was the new needle I was using--it's an Organ needle, 100/15 that I got because I found a deal. It's much bigger than the 75/11's I was using (Schmetz), and I think she just doesn't like the bigger needles.