Improved addon loader, reload, fixed arguments in Magic functions