Fixed S2E18 song count
Fixed up some more episodes