minor tweaks with onwer