I use the water-based grain filler these days (been buying Goodfilla). Water-based requires more work than the old oil-based stuff because it shrinks back more, but I don't have to worry about dangerous fumes and rags randomly bursting into flames.
Many people praise Z-pooxy, I plan to give it...