Fixed some brackets and things