fixes in branch