a few tweaks here and there after comments from students