Added captcha support, and did a minor cleanup.