Making more changes and corrections