minor changes in several areas