More formatting, minor corrections