improve incremental grounding; some fixes