Fixed eventListener leaks; improved stuff
Rename px to pe... is this a good change? idk