Tweaks to lab7.