improvements and fixes in incremental grounding