added separate lights control, minor bug fixes