Matthew -- minor changes to player.cc