Updated addon loader & fixed minor bugs