Various changes and fixes

Only tested maps, some changes to the json markup etc.