Progress towards module collection

Misc. updates and revisions