// various small improvements