Fixes, improvements, and optimizations.