numerous tweaks