Another round of improvements