Add data form plus fix typos