Final Changes.

Should be ready for submission.