Important refactorings and error corrections in modules