fixed up submission form completely