Fixed up the data stuff.