Add file hashfunction; change pw hashfunction slightly