added a bunch of places, prepared for flashlight implementation