some nit-fixes