Various Improvements

Added some features, tested both new tokens and re-using existing tokens.

Note, I moved the JS back into file. I really don't see any way this could cause an issue for someone unless there was an issue with the way the code was deployed or some other incorrect modification.