changes to parameters of couputerplayer
merged conflicts with computerplayer modifications