Merge pull request #31 from 1l2p/master

Loads of small changes.
Change subject of confirmation email