notational changes and improvements in main proof. Will need more profreading
Merge branch 'master' of https://github.com/subodhvsharma/paper-NPC