Added more statements and lexing for comments