More changes to submit script and test form#