update after numberous minor tweaks