Added some stuff, fixed indents