parsing speed improvements