Fixed commentaries/edit