Progress.
Updating alignment.
updating to RFC7105.
Whitespace cleanup.