Tweaks to homework pastoral mode