minor tweaks and corrections