token vs. package version fixes + general tidyup