Added all sentinels for user input.

Also cleaned up input