Made the hash table a bit more robust and pretty