[FIX] some speed optimizations to the parser
[FIX] forgot one file