a lot of clean up
work on bitmaps and general clean up