Static fixes, final touch ups before submission.

This is the commit I will be submitting.