Several minor changes / improvements.