update draft root generator
more cleanup