Bit of code refactoring and bug with multiple loader now fixedg