Fixed a bunch of public-key int required related errors, also added in a `tokens` table.