fixed up some data handling