fixed up some