Additional changes and refinements