Small fixes
More efficient bitmaps