Some more improvements...