Update player and fixes bugs