Many changes, again.

Some changes to the parser, added user input and buffers.