captcha support + bugfixes