improving docs and adding support for comments