updated fixes to make bz work, use newer API, and remove country