updates to lights module and other clean up