2nd homework

fix issues