Resolved Figure TODOs and added more space between paragraphs