fixed some conditional strings