bugfixed a few cases that were not handled properly; added overridable
LIVE_TOKEN_IDENTIFIER macro