clean up a lot of stuff and move things around