Npa weight

1. Mostly correct npa weights...still need to figure out factors
2. switches are more obvious
3. D3D npa chords
4. update input files