improve maps; clean up;