added hashing / salting and some small changes