rst => markdown
Fix NPF
Fix PF
cleanup