Tidy refs, add ideas for P1 discussion, small changes.