Fix indentation
Added lots of stuff