More work on the parser, should be in a quite "complete" state now.