Update for SWAN with M-value conversion & changed defaults.