various psychology fixes for issues migrated to github issues on 3/3/14