edits based on changes to hw lab, fix typos