Issue72 review of psychometry

Review of code of psychometrics: minors changes.

Mind the 3 fixme's.