score and other bug fixing