Minor Changes

Changes to Tokens, PhoneValidate and creation of TKValidate