additional cleanup; config improved for uspop+gtzan