[Patrick]

I use Timbermate. http://www.timbermate.com.au/. It's water-based. You can use it thick, right out of the container, as wood dough, or thin it to the consistancy of a milk shake for a grain filler. It drys fast, sands easy, and accepts any kind of stain. And there is no waste, because what ever is left over in your mixing tub can be re-constituted with a little water. It's great stuff!

Pat