reduce size of data in package and update a couple functions