some fixes and cleanup in addinggrasstools