Hi Eggie! 
Thanks for your notes as well as the fixes :)

I noticed you've reverted your own removal here. Why? 

Also isn't it possible to link 170 and 172 addresses here somehow? I see there is a thing called "relation".