Changed names of POST vars to include 'ufo-'

Also minor fixes.