added fixes and commits for module