Cleaning up edits and validation USAHockey Pull

Worknig on error handling