yay, fixes! :D