Added some number data validation. I'll see if I can take care of the location validation.