Comment parser and dictonaries added