Fix indenting

and some small errors