more fixes yay