Some updates
Use some generators instead of lists
Some cleanup and renaming
Add missing known token