#34 improve log messages