Fix tb_control_unit, and some more things