small changes to datastructs