put all address info into same object + fix bilingual YAML format - fixes #145 and fixes #149