Some improvements that I lost track of.