fix BUG & add score system