First part of major update (3.4)

Newly updated files with new markup and lots of corrections.