* Documentation and comments
* Fixed misread token issue