support for line comments, and fixed EOF