Module improvements and fixes
Module improvements and fixes