Convert images, fix image references and add more details