Fixed few bugs, captcha works better now