Some minor bug with flashligth fixed