minor improvements
got sidetracked, but maps are partially implemented.