Redid commentary + layout changes