Rebuild, hopfully with comments fixed (although not hooked up to legacy posts).