Updated Loader

Fixed some loader issues