Various Cleaning and Simplifying corrections