fix bootstrap to use src/node; update src/node branch