final fixes on hashing funcions