Tweaks, and use annotations instead of map
Merge pull request #32 from sethladd/patch-5