New custom variables, country-admin, bugfixes