some more work on commutation rules
small fixes