tweaks and corrections