more perf improvements
Merge pull request #332 from lml/jpslav_more_perf

more perf improvements