Manual additions from email
Corrected bad wikitext.