fixed branching issues, hazard stuff remains