Updated AddOnLoader

and other stuff