Address even more Bitmap comments

Keep them coming Michael - every review comment = an improvement.