lots of fixes to logic based on more experience with task types and pni_fcma source