Undid some minor changes that where to implement bitmap saving