Improve deamon logging
Merge branch 'log-for' into dev