perf tweaks, ~10.7-8ms now for zebra on MBA 1.7ghz