Small tweaks....

finished adding validation