data related updates

still not happy with the data structure