Maps

Changes to the maps branch (details in email)