Added captcha & bug fix