some small fixes/updates.
Merge pull request #13 from ismooch/master

some small fixes/updates.