a few additional changes