streamline branches
varius fixes