Documentation, M4 fixes, and other changes.