Fixed User Input Issues