added cs files, bugfixes + more loggs