add suport for songtaste
fix trailing whitespace errors
keep things in alphabet order