fixed more branch issues