fixed and added branching stuff