Ironing out last kinks