World Wrap and P2

Changes only to documentation for clarity.