fixed up forms