Fix suffix/outfix
Fix grade down/sort
Fix x: