added comments/string to lexer; added string concat