Deal with comments, unit tests

- Deal with comments + unit tests.
- Version 3.6.0.0