Some more additions / refinements / explanations