Flashlight and bug fixes