fixed & issue and corrected the tokens