patch by hand: binch made many changes

active
like
favor

Signed-off-by: root <root@i-twwevaep.(none)>