And some more optimizations.