MEGA COMMIT

Fixed tons of stuff§