Fixed h w swap.  Also don't save hash files here...