Some copy editing, significant template restructure.