Minor updates. Grinding fixes WIP.