Added CAPTCHA, a few other things