Minor improvements/corrections.