reorganize code before adding real checks
fix error handling in score
add demo check
Simplify demo check