Some bug fixes in calculateScore | Fixed substitute | Added calculateOnly for calculate score without substitution