[dist] add moar dribble shots, [wf] small changes