Cleanup, comment on ipv6, use insert on duplicate ... action