- fix lights
 - few other improvements