Added music suggestions with various internal changes