Serveral bufixes, added hashmap support