changes and fixes to support module