Added and fixed bugs around the play method.