fixed user input issues