add validaton fix few bugs
