Misc fixes and cleanup
WIP: convert Bitmap/BitmapData