nirna's work and myself merged: check/uncheck/delete/edit