lots of tweaks
Merge pull request #2 from AdamHolwerda/master

lots of tweaks