Fix typo and Hash/Map