fixed up some import statements