-BUGFIX: improved Logging