fix segfault
better parser
dodo merged
wip