SO MANY FIXES!