Some more improvements.