fixed SO MANY BUGS