Fixed some bugs, indented some stuf, etc...