cleanup and work on scroll around thingy