Edition, deletion, small fixes