Comment Editing. Closes #23