FIXED ALL THE BUGS!!!