mapping tweaks
Merge pull request #155 from douginator2000/agut

mapping tweaks