various improvements and <some> progress on maps
maps added
clean up fixes
map fixes, styles updated