merge and add in misc files
still some bugs on CD; the s2 shouldn't have control dependency by so many nodes