Prepare for mwf submodule; other minor changes