Numerous small bug fixes and optimizations.