Tweaks, added map