more bugfixes, disabled travis benchmark run for now