fixed a lot of form stuff again