Pathfinder now includes diags

Also tinkered a bit with stuffs