fixed scoring and other issues