some additional changes that were missing from this branch