Improved module loading plus added some comments