Further refinements to the Leo workbook.