clean up/updates/etc
Merge pull request #2 from alteredlikeness/master

master