made minor changes
fixed branching issues