fixing up forms