Finalized.

Looking through final changes. Everything looks pretty good though.