Fix validation and give better feedback