See commit for full list of changes. - Generally added more to the map;