Improve @desc, test @dig