various small changes...