Add grok ; fix "extra stuff bug"