added some more input validation