Fixed bugs and indenting