fixed some perf issues
0.0.22