Separation of sorts fixes and printing fixes.