Bugs manifested by simple fit corrected.
Expose modules at higher level.