fixed annotation bug, it no longer ignores word boundaries.  fixed map bug where the map wasn't displaying properly.  the map fix should be reviewed.