Various tweaks
Merge pull request #42 from Crowdtilt/various

Various tweaks