Fix some whitespace issues
Adapt some of the TODO-comments
Change dates