more user input validation fixes