fixed up stuff finished 6.6