Correct several cases where prompt for user input was not consistant