some additional changes

Some changes from vitae