added map; added string; fixed map;  fixed string;