fixed up forms and scopes