General updates and refinements