Fixed switch and play, added player comments