bug fix + add country model