bugfixes, map, and contact-single