fixed isTokenValid, started work on edit fixes, recaptcha fix test