token fixes
master updates and cache flushes