core indx change to prevent token grabbing
a few extras
merge emax branch

Merge branch 'emax'