Add score check and small fixes based on client feedback