Change events to .on()

So that it works at start/future stuff