nit fixes and corrections