renamed a bunch of classes, members, and methods. minor refactoring.
Fix light factoring.