fixing up forms and stuff