Various minor updates and refinements