Parser fixed, and speed increased.