HUGE commit

Sorry @tonkmr , or whoever reviews it.

a
This is minor, but should be: "...parameter will take"