corrected map class and added location.