Added comments

- better & more reliable way to calculate token lengths
- add single line comments