Eliminating some performance bottlenecks; more to be done.
8 files changed