P3 now in despatcher and misc/p3; glossary search and xis still to do