Added TODOs after code review.
Changed logging configuration.
Merge branch 'dev' into topic_comments
#506