edit comment WIP
Edit comment done and ready for presentation
merge with master