editing, deleting, other fixes