Did some more sanitizing and validating