fixs & new files for modules