Fixed indentations

Will actually go through an fix a few bugs I've seen later.