Cleanup and added dependencies in Modulefile.