reshuffled parser, lots of new tests, more todo