Separated captcha validation from model validation and other minor tweaks.