Tweaks made per instructor feedback