Fixes and logic improvements
Added scoring and restarting