Fix event listeners. Still doing a lot of work but it performs better than it did.