performance improvements
12 files changed