changed score calculation, bug fixes