Added music, fixed some metric bugs