adjust log messages
Improve comment
Try to implement thing talked about with spohl.