various improvements and <some> progress on maps