more fixes in parsing very large file