some perf tweeks

still two failing tests