fixes, cleanup. Added user-set 1st pass initial CRF