modify: comments
modify: uploaders for figures and images