some minor changes around