mina's fixes