minor changes around the place