Added link handling and paragraph spacing