Finally (!?) fix the SOne and SAlias exchange bug
Add small work on cut elim