update & improve diary
Merge branch 'richard'