rolled back my last commit for stripping P tags around UL/OL, which had broken logic.