Added some last changes to companions