Fix typo and add jNizM's suggestions