FIX annoyng error on debug and ADD validation on row editing