end psi capture controversy.

add new config option :(
add new strings :(
refactor unit tally into unified function, take psi setting into account.