Allow comments to be edited plus one bug fix