made various small changes