Diary

...and some minor newlines
Oops, fixed the sorter :)