getting better
adjusts wait timeout
removes faye's name