Fixed more of the bracket stuff