fixed some bugs, seems to be working once again w/ tuples insetad of idandname structs