several bugfixes, removed debugger