Working on comments edit. Fixes