added more stuff for the benchmarking + bugfixes