Adrian Hatch

fix all the bugs