White-space corrections & small improvements.