Some changes to parsing, work on node classes