fix address fields, upgrade features