fix submiter overwrite and some typos