Update, Clean up and Regression Fix.