Some bugfixes
PEG WIP
Capture full expression
more wip
more wip
update deps