Some changes, added ReCaptcha