'branch' bugs fixed