names now mostly working (except double word names).