make branches work again, and fix register sets.
I thought I just merged, but evidently, not? I have no clue what is going on here.