Misc changes towards rump working. Balanced pipeline is disabled pending rump stuff.