remove conditional address
reorder grid inserts
remove extra comments
show correct home address on first home score screen