Captcha enhance

Different branch on purpose.