edit on double click + other changes