Add GrubHero, fix some bugs