latest changes

included more functionality in lighting class and small test switch