Updated validation 'n' stuff...