fixes to map and structure