some slight changes to forms