various tweaks for more scale and robustness