Better markup. Fixed some typos