further improvements, no awkward speedups anymore