More form fixes yay