Comments, code cleanup, extra safety checks.
More listeners.