Fixed small errors more