fixing typos and cleaning imports. no logical change.