various small improvements and investigations