fixed a couple forms and such