Fix indenting/fixed some nasty errors