Fix things & simplify pack data into a datastructure