just fixed

just fixed every bug that matt made