More maps
minor bugfixes