Adjusted form field lengths, renamed some variables