hw06 issues fixed