main_nw
updates for nw
nw align
Merge branch 'pxnw'