various small additions