Fixed hyphens and dashes issue by spearating to their own function. Using &#160; instead of &nbsp; now.