bugfixes in hashmap