making a couple small rearangements on fix_songs