Various tweaks
Merge pull request #1 from wilkinsona/tweaks

Various tweaks