fixing a few map question bugs