fix #181

* + some better log messages