several updates and fixes to "modernize" the module