Fixing some stuff to get it to deploy.  Also fixing hash function so it should not overlap as much.