Can I just add a note about yelping when a puppy nips? I've just been reminded of it on another forum and it's worth mentioning:

Terrier breeds are often more wound up if you emit a high-pitched yelp/squeak - think of the noise a rat makes A deeper "OW!!" and time-out might be more effective.