Polish up find/replace, other bits of polish