// various small changes