minor mechanical changes