Better messaging
More validation