Added TODOs after code review.
Changed logging configuration.