general improvements
increase parsing speed