some more minor performance tweaks
15 files changed