cleanup, fix lights, some other changes