Format fix and song loop