various fixes of github issues (#361, #360, #359, #356, #265, #264
Merge pull request #370 from Connexions/psychology-github-issues

various fixes of github issues (#361, #360, #359, #356, #265, #264