Formatting additiions and minor changes.