Fixing issues, and added scoring syste,