various small changes at several places