Various fixes for the new system
Renamed to make more sense
Minor
Updated exports
Fixed bad order in with-module