basic perf improvements