several improvements draft

(0) -1 +1 +10 +30 tip

mercurial