Feature/enhance songs