Some formatting, some comment amendments