Issues fixed with user input