slight performance/testing tweaks