Update mwf; other minor changes