Tom's Feb 6 revisions of perm_income module