improvements in several places