some bugfixes
unified logging