various small improvements.