Fixing bug and adding score feature