Added more energy features for use in speech/music discrimination.