Final changes for the night, improved sorting