various little change for perf mainly