Moved messages around, moved userinput variables entirely within the parser.
Also some cleaning up.