fixed branches and added some code to dev