Made some changes to player. Fixed bug vijay pointed out.