few minor changes for form