added flashlight, reworked a bunch of stuff