fixed up some changes