More bits and pieces, mostly search and replace