Some (very) primitive efforts at moving pieces, and fixing related typos.
Fixed a somewhat awkward typo.