Corrections from intern walkthrough