Almost final changes and refinements