scoring and other fixes