Fixed MOREEEE BUGS.