fixed validation and clear all