Improve <p> extraction
Add title to output