Sorted out Bonus Point, just need to debug end game for bonus point not earned scenario. Next fix Counting