Review changes

As discussed in https://moodle.org/mod/forum/discuss.php?d=260165#p1127686, a few changes
Hope this helps,
Andrew