fix map, add some friends
Merge pull request #43 from davidascher/da-logtweaks

fix map, add some friends