added more fields, improved validation handlers