Module improvements and fixes