fix few details, hash table