added a bunch of lights stuff and small tweaks