Several fixes and improvements
Fixed countries dict