Really fixed indexing this time

Updated TID/BID to send the right data to the right places.