added commenting editing, closes #6