Re-introduce bifurcation stuff...
Clean-up bifurcation stuff... and fix a few bugs.
A bit more on the  bifurcation stuff, it needs work....
Merge remote-tracking branch 'origin/master'

merge origin...