Some bug fixes, some unecessary calls to the Camera API are now avoided.