Lights working with master and other bugs fixed