final round of performance tweaks