small improvements done