Song Expansion - Final Fix

Found and fixed more weird bugs with the song expansion. Should be the final time this needs to be fixed