Numerous changes to module file