tweaks from load testing