Better EOF parsing. Added peek char methods