Adding all new lighting features and bug fixes