Added validation, other tweaks
Aesthetic tweaks