Changed a bunch of little things, including onEnable Event registering