(fix) clean up solution to week3 program, complete some problems