Further header-related changes. Wikilink syntax not allowed in header, however simply using wiki proper name recognizes. Other optimizations and unnecessary carriage returns removed