#15 various small improvements