collect PSI search stuff into one place, add comments