Minor changes and adding in the module