cleanup, perf work, speed change fixes.