Optimized performance.

Minor bug fixes.