Fix token specifier
Simplify document declarations
Fix tilde and SI errors
Mahor re-organization and cleanup