tweaks and new sample map