Fixed issue with marker.json not giving types. Also fixed indentation elsewhere.