Fixed user input stuff, almost ready for submission