updating for better map display. a few bug fixes.