Fixed all of joshes bugs

SO MANY BUGS