a myriad of minor tweaks
Merge pull request #38 from nicholalexander/tweaks

a myriad of minor tweaks