reordering prelims
Merge branch 'master' of https://github.com/subodhvsharma/paper-NPC
trace; minor tweaks in prelims
merging conflict