clean up formatting, separate form submission failure messages, added some more validations