some form improvements added