Fixed some smaller issues, though some issues remain with parsing the tempo