Tons of stuff for m4

Review additions below. Basically most of the stuff for m4.