Bugfixes for Psychology - 2nd changeset

Multiple bugfixes for Psychology text. Fixes #526, #525, #522, #520, #519, #518, #516, #513, #480
Can these be on separate lines?