more fixes, yay