Tidy-up log entries and add TODOs