More changes.

- Increased performance.
- Small fix.