Fixes
Fixes and new table Country Risk Main