Added a ton
cleaned up some extra code
Merge pull request #1 from dbonasera/master

Sexy time