Fixed some errors in the module code!