minor fixes and file for map class