various small additions and fixes