More cleanup and corrections.