#2 map and code fixes