Improve logging.
fix merge conflicts
Merge pull request #2 from ZombiePro/task/improve_logs

Improve logging.