minor changes in hashmap