Fixing NRDS issues, Python3 was causing str/byte confusion. Some token issues.