fixing it up
fixed a bunch of stuff
Merge pull request #1 from jtrinklein/fix-it-up

it works now.. better than ever