Simplified key and token generation and in the process resolved some issues with plus signs in keys that caused problems with url encoding