few more speedups