Bugfixes according to latest refactoring + more data