improved logging a bit more