fixed map, updated bootstrap