small enhancements to module wrapper
simplified module handling