Sync points/win condition properly
Merge branch 'master' into fixes
Merge branch 'fixes'