deals with a couple of data issues