Updated Logging and some Bugfixes