Some minor changes / improvements.