Fixed current song handling and added async library