module fixes and api tweak
Merge pull request #797 from unikent/feature/module-fixes

module fixes and api tweak