Improved userinput
Improved userinput