Further wotrk done, mostly regarding maps