various small improvements