Fixed a bug with comments, added secondary tokens, removed case_dependency.