changes to forms and stuff

da