Final branching commit

All issues should be fixed now.