Parser updates. Better graphs, start normalizing
parser stuff