Lots and lots of fixes.
On a plus note we now have the changed operator back.