Branch fix

fixes are done.