Bug fixing + Flashlight support.