Makeflow trifurcation

minor fixes