Make Xml possible in the parse tree + misc improvements

See #21 and #22.