minor tidy up, and fix some copy & paste problems from patchoo.