MORE FIXES YAY