various small additions and changes