Imporved validation, formation and spelling