some typos and template rearrangement