Added scores and minor fixes
fixes