another awesome contribution from the Minutiæ Man!
s/addr/client_addr where appropriate
bundle update