updates from BZ 1024305. Some other formatting fixes.