Improve automation of handler registration. Remove debug from fireworks.