ironed out some stuff