un-Fizzling and general light refactoring