Tweaks and maps
Fixes