Little tweaks. Fixed Validation