ran again with fixes