A few changes!

Tim,

Hopefully you'll be able to work out how to pull these changes and from my github to yours, and then pull again to your local copy. Let me know if you have any problems.

mark.