Untabified; fixed a few formatting bugs; added note to LW page
Resolved conflicts