More Cafe code and doc