fix wstool(#20) and minor refactor (branch_parent must not be None anyway)