small minor changes around