Fixed some wrong uses of <p>. Fixes many of #2