Added verbose flag for modules
Removed cruft code
Docs updated