small tweaks and corrections