new branch
Fixed some small errors