Bunch o' updates
Updated a bunch more
Merge pull request #4 from sallain/master

Tons of updates