various small changes.