fixed parser to merge propositions
started switching to iterative
halfway through adding intervals, saving a midpoint here
some more work, need to fix intbuffer next
Merge remote-tracking branch 'origin/akane' into akane