Lots of cleanup. Added our new maps removed old ones. Some collision
bugs left. Working on scrolling map.