Added more validation and making sure that the forms help the user as well.