bugfixes, logging - Stage1 fertig