* Cleaning and corrections.