General updates and cleaning.