progress and clean-ups on event handler/listener JS generator