fixed up some hw