Refactoring and remaining bugfixes for psychology

Bugfixes for newly refactored Psychology text codebase.  These fixes also include the remaining issues reported by Words and Numbers.