Minor improvements.
7 files changed