updates to hw 6 and fixing names