Several features

A small change to a more correct operation rewrite.