improving forms, fixes #29