Cleanup and added captcha, global redirect