New wesCountry and graphs bugs fixed