added support for comments and imports
add tests for comments and imports