fixed up some decleration errors