psi fixes
Merge pull request #23 from dimagi/ps

psi fixes