I'm still working on it, although my code immersion time this week has been limited. Efforts to completely eliminate clicks resulted in significantly messier code than I liked, so I decided to undertake a major restructuring, and implemented a state machine to track the generator state and prevent clicks. The good news is that it is pretty much click proof now. The bad news is that I broke the hijack interface in doing so, and need to clean that up.