some initial perf tweaks