final commits and corrections