General performance improvements and bug fixes.