Another round of improvements.