FIXED BUGS!!

:)