Homework9 a few more tweaks