fixed up my last things.
Merge pull request #3 from cjwillia/master

Final fixes.