Changes and comments.
Would be fun to work on this for the coming years! ;-)