Finalised grunting, most issues sorted