psi class associations unified + bug fixes