Fixed a buttload of errors