a few tweaks here and there after comments from students
Merge commit '315b2c2c56d3ce4b567b78753e895f711fe2a52c' into utf8