Lots of little changes
Merge pull request #1 from jcow/master

Small tweaks