various small changes